validator overhaul