Implement Matt's timestamp requirement