Added combats and actions