More mapping. General update for 2nd computer use.