Changes

modified the validate statements