update in handling dates