Unfortunately there were compiling errors need more work

Sorry about last PR I didn't check if the upgrading version compiles, I thought I did so, these one hopefully compiles