A little more optimisation