Try to make the map a bit less shitty