part 1 of expandable sources commit