IMproving optimisation functionality