Simplyfied code for programme_choices a bit