designate new source for a few, remove some problematic ones
designate new source for a few, remove some problematic ones