Added location controller