Modified validate