Improvements and Optimisations