major rework of sources - part 1