start of changes for allow date and or time change