Remaining reqs logic fixed