Instant validation switch added.