Map updates correctly
Map updates correctly