Optimisations and a new command