Some more optimisation