Update file naming; Add timer