State machine location handling - In progress