Changes to Optimisation and GA