Added logic to use existing address/cc when available