reworked map a bit