moved validator to right place