updated to add timestamps