TOF – Improving