Latest chooser modifications for 4.0 launch from legal team