added more support for combat