fixing date not done yet