Manual merge with Aaron's game changes