Tested and working

Loc 7