Added changes to Stores controller from Ben