rollign back manual-copy of drew's maps-branch