merging deleted the mistakes in validator

returned my validator fix , need to be tested again . not completed