change source to using Timestamp