More Updates to Combat

To be integrated to mainApp