Added isDay check