update the structure, and prepare for nfc
merge conflicts