now have to fix date