rename and optimisation