Changes to GameObject.h/cpp