Update optimisation + comments