* added validator stuff