modified validator