Working on timings, file renaming