add more combat support