A bit more optimisation.