refactored from comments to stories