WiP de-ghost in update