Adding Choice Controller