changes from validator