WYRL: trying to make the optimisation work.