some combat working