date bug
modified bug