diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas
index 9a582c4f..6c17d41e 100644
--- a/Nasal/ECAM-controller.nas
+++ b/Nasal/ECAM-controller.nas
@@ -54,11 +54,15 @@
 # PHASE: /FMGC/status/phase
 
 # DISPLAY: 1 - EWD 2 - MEMO 3 - STATUS
+
+# commented lines of logic are waiting for proper FMGC warning phases
 var num_lines = 6;
 var msg = nil;
 var spacer = nil;
 var line = nil;
 var right_line = nil;
+setprop("/ECAM/warnings/master-warning-light", 0);
+setprop("/ECAM/warnings/master-caution-light", 0);
 
 var warning = {
 	msg: "",
@@ -66,13 +70,17 @@ var warning = {
 	colour: "",
 	aural: "",
 	light: "",
-	new: func(msg,active,colour,aural,light) {
+	noRepeat: 0,
+	new: func(msg,active,colour,aural,light,noRepeat) {
 		
 		var t = {parents:[warning]};
 		
 		t.msg = msg;
 		t.active = active;
 		t.colour = colour;
+		t.aural = aural;
+		t.light = light;
+		t.noRepeat = noRepeat;
 		
 		return t
 	
@@ -89,15 +97,19 @@ var warning = {
 			setprop("/ECAM/msg/linec" ~ line, me.colour);
 		}
 	},
+	warnlight: func() {
+		if (me.light != "none" and me.noRepeat == 0 and me.active == 1) { # only toggle light once per message, allows canceling 
+			setprop("/ECAM/warnings/master-"~me.light~"-light", 1);
+			me.noRepeat = 1;
+		}
+	},
 };
 
 var memo = {
 	msg: "",
 	active: 0,
 	colour: "",
-	aural: "",
-	light: "",
-	new: func(msg,active,colour,aural,light) {
+	new: func(msg,active,colour) {
 		
 		var t = {parents:[memo]};
 		
@@ -123,7 +135,7 @@ var memo = {
 # messages logic and added to arrays
 
 var warnings = std.Vector.new([
-var lg_not_dn = warning.new(msg: "L/G GEAR NOT DOWN", active: 0, colour: "r")
+var lg_not_dn = warning.new(msg: "L/G GEAR NOT DOWN", active: 0, colour: "r", aural: "crc", light: "warning", noRepeat: 0)
 ]);
 
 var memos = std.Vector.new([
@@ -134,9 +146,11 @@ var park_brk = memo.new(msg: "PARK BRK", active: 0, colour: "g")
 
 var messages_priority_3 = func {
 	if (getprop("/controls/flight/flap-pos") > 2 and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and getprop("/FMGC/status/phase") == 5) {
-		lg_not_dn.active = 1;
+	# if ((getprop("/controls/flight/flap-pos") > 2 and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and (getprop("/FMGC/status/phase") != 3 and getprop("/FMGC/status/phase") != 4 and getprop("/FMGC/status/phase") != 5)) or ((getprop("/engines/engine[0]/n1-actual") < 75.0 and getprop("/engines/engine[1]/n1-actual") < 75.0) and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and (getprop("/FMGC/status/phase") != 3 and getprop("/FMGC/status/phase") != 4 and getprop("/FMGC/status/phase") != 5 and getprop("/FMGC/status/phase") != 6)) or (((getprop("/engines/engine[0]/n1-actual") < 77.0 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) or (getprop("/engines/engine[1]/n1-actual") < 77.0 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) and getprop("/position/gear-agl-ft") < 750 and getprop("/gear/gear[1]/position-norm") != 1 and (getprop("/FMGC/status/phase") != 3 and getprop("/FMGC/status/phase") != 4 and getprop("/FMGC/status/phase") != 5 and getprop("/FMGC/status/phase") != 6))) {
+	lg_not_dn.active = 1;
 	} else {
 		lg_not_dn.active = 0;
+		lg_not_dn.noRepeat = 0;
 	}
 }
 var messages_priority_2 = func {}
@@ -149,11 +163,18 @@ var messages_right_memo = func {
 	} else {
 		gnd_splrs.active = 0;
 	}
+	
+	#if (getprop("/controls/gear/brake-parking") == 1 and getprop("/FMGC/status/phase") != 3) {
 	if (getprop("/controls/gear/brake-parking") == 1) {
 		park_brk.active = 1;
 	} else {
 		park_brk.active = 0;
 	}
+	if (getprop("/FMGC/status/phase") >= 4 and getprop("/FMGC/status/phase") <= 8) {
+		park_brk.colour = "a";
+	} else {
+		park_brk.colour = "g";
+	}
 }
 
 # Finally the controller
@@ -175,17 +196,13 @@ var ECAM_controller = {
 		
 		if (warnings.size() > 0) {
 			for(var n=1; n<8; n+=1) {
-				# if (!warnings.contains(getprop("/ECAM/msg/line" ~ (n)))) {
-					setprop("/ECAM/msg/line" ~ n, "");
-				#}
+				setprop("/ECAM/msg/line" ~ n, "");
 			}
 		}
 		
 		if (memos.size() > 0) {
 			for(var n=1; n<8; n+=1) {
-				# if (!memos.contains(getprop("/ECAM/rightmsg/line" ~ (n)))) {
-					setprop("/ECAM/rightmsg/line" ~ n, "");
-				# }
+				setprop("/ECAM/rightmsg/line" ~ n, "");
 			}
 		}
 		
@@ -193,6 +210,7 @@ var ECAM_controller = {
 		
 		foreach (var i; warnings.vector) {
 			i.write();
+			i.warnlight();
 		}
 		
 		foreach (var m; memos.vector) {
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index 33ef403a..7eb33a15 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1468,6 +1468,57 @@
 				<factor>0.60</factor>
 			</volume>
 		</announcements>
+		
+		<chime>
+			<name>Chime</name>
+			<path>Aircraft/IDG-A32X/Sounds/Cockpit/chime.wav</path>
+			<mode>once</mode>
+			<type>avionics</type>
+			<condition>
+				<property>/sim/sound/warnings/chime</property>
+			</condition>
+			<volume>
+				<property>sim/sound/effects/volume</property>
+			</volume>
+			<reference-dist>10</reference-dist>
+			<max-dist>100</max-dist>
+		</chime>
+
+		<crc>
+			<name>CRC</name>
+			<path>Aircraft/IDG-A32X/Sounds/Cockpit/crc.wav</path>
+			<mode>looped</mode>
+			<type>avionics</type>
+			<condition>
+				<property>/warnings/master-warning-light</property>
+				<property>/sim/sound/warnings/crc</property>
+			</condition>
+			<volume>
+				<property>sim/sound/effects/volume</property>
+			</volume>
+			<reference-dist>10</reference-dist>
+			<max-dist>100</max-dist>
+		</crc>
+	
+		<stall-voice>
+			<name>stall-voice</name>
+			<mode>looped</mode>
+			<path>/Aircraft/IDG-A32X/Sounds/Cockpit/stall_voice.wav</path>
+			<type>avionics</type>
+			<condition>
+				<property>warnings/stall/active</property>
+			</condition>
+			<volume>
+				<property>sim/sound/effects/volume</property>
+				<factor>3</factor>
+				<!--offset>1</offset-->
+				<min>1</min>
+				<max>6</max>
+			</volume>
+
+			<reference-dist>10</reference-dist>
+			<max-dist>100.0</max-dist>
+		</stall-voice>
 
 	  </fx>
 </PropertyList>
\ No newline at end of file
diff --git a/Sounds/Cockpit/chime.wav b/Sounds/Cockpit/chime.wav
new file mode 100644
index 00000000..4a575fce
Binary files /dev/null and b/Sounds/Cockpit/chime.wav differ
diff --git a/Sounds/Cockpit/crc.wav b/Sounds/Cockpit/crc.wav
new file mode 100644
index 00000000..72888c8e
Binary files /dev/null and b/Sounds/Cockpit/crc.wav differ
diff --git a/Sounds/Cockpit/stall_voice.wav b/Sounds/Cockpit/stall_voice.wav
new file mode 100644
index 00000000..ff066513
Binary files /dev/null and b/Sounds/Cockpit/stall_voice.wav differ