4.4.4 optimised changes