refactor for validus