addressed validation concerns