Slight optimisation of deployment