Changed how to validate