Structural update.  Do not use this yet\!