Prepare for restruct (joh.)