further changes to fix date issue