Fixing Location

Doing it right this time