added comments and using the original date