upgraded expand-region and org