Added optimisation and evaluation