Assembler no longer needs GameUpdate
Fixed merge conflicts