Add change of ownership section and adjust logic.