removed 'stay at place mapping' - needs some refining