A change to match extraction in SU

there is the first of changes to how stores are create in total