Optimisation

Optimisation of all of it.