add timestamp rewrite for post-commit
remove tosunday, use post-commit