rewrite with validators