Put to where necessary (18/48)

Put to where necessary