Optimisations

Commit final