added timestamping and datestamping