3.2.2 last tweaks in E.