add notification if need to add more users and stories
refactoring
debug
some merging