added functionality
removed recursive content gathering