fixed optimiser to use correct eligibility