massive updates
notes claimed the removed part was fixed in stage3 rebuild