updated World to Location and changed related variables