Trying to fix the timestamp logic

But failing