Eligibility validation added/working