Added some optimisation options.