Optimisation

Does some stuff, yeah?