Note some potential optimisations