adding timestamp check