Made date entry more flexible