WIP changing dep mapping