Kind of fixed the DrawMap class