ready for maps
solving conflics