Further improvements to CD4 optimisation