add contidtion for daylight savings