Should this be changed to flat store?