fix stage and rearrange carrot stage