Ideas for further optimisation