final commit for the map clobber (sorry for the ado)