diff --git a/Assets/Generator.cs b/Assets/Generator.cs
index 3ae7824..4d225f6 100644
--- a/Assets/Generator.cs
+++ b/Assets/Generator.cs
@@ -7,10 +7,12 @@ public class Generator : MonoBehaviour {
 	public GameObject mcreator;
 	public GameObject ucreator;
 	public GameObject imanager;
+	public GameObject amanager;
 	TurnManagerScript tScript;
 	MapCreation mScript;
 	UnitCreator uScript;
 	InputManagerScript iScript;
+	AudioManager aScript;
 
 	// Use this for initialization
 	void Start () {
@@ -21,6 +23,7 @@ public class Generator : MonoBehaviour {
 		GameObject mapCreator = Instantiate (mcreator);
 		GameObject unitCreator = Instantiate (ucreator);
 		GameObject inputMan = Instantiate (imanager);
+		GameObject audioMan = Instantiate (amanager);
 		tScript = turnMan.GetComponent<TurnManagerScript> ();
 		mScript = mapCreator.GetComponent<MapCreation> ();
 		uScript = unitCreator.GetComponent<UnitCreator> ();
diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs
index bb3cbdf..511aec4 100644
--- a/Assets/TurnManagerScript.cs
+++ b/Assets/TurnManagerScript.cs
@@ -150,6 +150,13 @@ public class TurnManagerScript : MonoBehaviour {
 	}
 
 	void changeTeam (int newTeam) {
+		int previousTeam = actualPlayer;
+		for (int i = 0; i < unitList [previousTeam].Count; i++) {
+			GameObject go = unitList [previousTeam] [i];
+			UnitBehaviour ub = go.GetComponent<UnitBehaviour> ();
+			ub.remainingActions = ub.actionsPerTurn;
+		}
+
 		actualPlayer = newTeam;
 		actualNumChars = unitList [actualPlayer].Count;
 		actualNumFinishedChars = 0;