Instant map update

Optimization is cool!