Take isValid call out again