added possibility of specify a source to look at