Interim commit of CHOICE code