adding userStore to listener
refactoring to Store