Moved choice prompt logic to reflect actual UX design