fixses on date check and timezone check