new timings and clean up