Edit timings, make faster