now with map working