refactored _sources (added blocks)