Use to where necessary (18/48)

Use to where necessary