More changes for breakup of source