date working better