Validation Part2:

  Completion of old/new validation switch.