More improvements to Step 1 and Step 2 of the interests assessment.