'all' functionality in sourceIds + small changes in source segment
little more