Added combat changes