E1S4: improved more stuff