Rework up to 3.2.3 (excluded)