map change, optimizations, debug tracing