integrating updated validator