Optimisations + few changes + new command /Flat