Changes to location state machine