optimisations made