refactoring sources+pres