trying to improve map stuff