working on fixing dates