Optmisation and rework