Implementing choice, fixed text bug on wait