Refactor stage 4.5 to be in line with stage 3.