Redesign towards 8.2. Unification of stages.