Repaired validation

Validation is now repaired back to basic function.