added more to combat class