Get rid of 'source' loop