More optimisation and benchmark results