Timestamps

I think this should fix it. Let me know.