Yes, not upgrading.
Basically I am just too used to XternalSD module for Xposed, i.e. swapping the External SD with Internal memory.
I just dont feel comfortable to leave the data with Internal Memory, a careless Odin flash will wipe the internal memory.
And, yea, Magisk does not work for S7...