Round 3 for CI: should be final