Removed the onStore call completely