added has map stuff