Minor restructurisation to fix deobfuscation issue
Separated out postMove, should help with some update errors