map working now