Feature/new stage 3