E1S5.1: added map
E1S4: some progress