I am so happy to hear that you found a solution that every one can live with.

Does this mean that C. P. is back in the house.?