changes to include Segmented View