Refactorized the timestamp code. Solved the bug that apply the timestamp to the next verb and not the one that the user has been seeing since last change.