Use to where necessary (12/48)

Use to where necessary