changes from wtxvalidator work