V2.1 Rewrite validator