the most up to date revision with comment timestamp fixed