added Brian's map code