Changes based on feedback from Ulrik on mapping