prettify and add maps
conflicts