Added time limitations to non-choice stages