re-map done but iffy again