Modified the orphan release to occur when shapes are added instead of released.