merged changes from in-progress game