Synch fix; Location context logic