unify files and add more timings