Remake location system
Update
Clean up