Changes to GameObject and Window