updated to utilize timestamping