Solution 8 modifications