changes for code review
fixes validation problems