FIX: Fix after rebase
FIX: Fix alpha and choices