moving ch2 to v4.x