Added Further Optimisations