added most feature in combat activity