compile after upgrade and many edits