Adding lower optimisations into the mix