Round 4 Extended 5

Similar changes. Trying to fix it.