Second and more streamlined implementation of the new source functionality