Updated location controller