Update to combat stuff