map change now works in both ways