more work on validation, removed 26 condition