Using timestamps on tmp files
Merged