Feature/141105/stage select