added navigation/multi apartment support