Made change to validation to reduce complexity