still mistakes with map