Timestamping code
Updated timestamp code