E1S7: map improvement pass 1