changed date handlinig