improve location change management