update for changes to env&map