Replace 2.1 with 2.2 stragglers