date issue partly resolved