Reverted latest changes with store