Work part 2 (24/46)

Work part 2