Eliminated thirdRoll (but need to fix tests)