CHANGE: Some performance optimisations