ex_7 changes - still in progress