Updates to Scenario 8 (still in progress)