Validator_Pass2

some of the changes like equ and org