are we saving the dependent CPs?  seems like we still need to do that.