optimised changes