diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Validation/Controller.mos
index a7b9cc9b5d2..d897790f359 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Validation/Controller.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Validation/Controller.mos
@@ -1,8 +1,14 @@
 simulateModel("Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Validation.Controller", method="Cvode", stopTime=10800, tolerance=1e-06, resultFile="plaCon");
-createPlot(id=1, position={20, 20, 1200, 1250}, y={"chiPlaCon.plaEna.yPla", "chiPlaCon.wseSta.y", "chiPlaCon.staSetCon.yUp", "chiPlaCon.staSetCon.ySta"}, range={0.0, 11000.0, -0.5, 2.5}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
-createPlot(id=1, position={20, 20, 1200, 1250}, y={"chiPlaCon.upProCon.yChi[1]", "chiPlaCon.upProCon.yChi[2]"}, range={0.0, 11000.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}, timeUnit="s");
-createPlot(id=2, position={1230, 20, 1200, 1250}, y={"chiPlaCon.upProCon.yChiHeaCon[1]", "chiPlaCon.upProCon.yChiHeaCon[2]"}, range={0.0, 11000.0, -1.0, 2.0}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}}, timeUnit="s");
-createPlot(id=2, position={1230, 20, 1200, 1250}, y={"chiPlaCon.upProCon.yChiWatIsoVal[1]", "chiPlaCon.upProCon.yChiWatIsoVal[2]"}, range={0.0, 11000.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
-createPlot(id=2, position={1230, 20, 1200, 1250}, y={"chiPlaCon.upProCon.yConWatPumNum"}, range={0.0, 11000.0, -2.0, 4.0}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="s");
-createPlot(id=2, position={1230, 20, 1200, 1250}, y={"chiPlaCon.upProCon.yTowStaUp"}, range={0.0, 11000.0, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}}, timeUnit="s");
-
+createPlot(id=1, position={9, 9, 1014, 1452}, y={"chiPlaCon.uChiConIsoVal[1]", "chiPlaCon.uChiConIsoVal[2]", "chiPlaCon.uChiIsoVal[1]", "chiPlaCon.uChiIsoVal[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=1, position={9, 9, 1014, 1452}, y={"chiPlaCon.uChi[1]", "chiPlaCon.uChi[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=1, position={9, 9, 1014, 1452}, y={"chiPlaCon.yChiWatPum[1]", "chiPlaCon.yChiWatPum[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=1, position={9, 9, 1014, 1452}, y={"chiPlaCon.yChiPumSpe[1]", "chiPlaCon.yChiPumSpe[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=1, position={9, 9, 1014, 1452}, y={"chiPlaCon.yEcoConWatIsoVal"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=5, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=2, position={1031, 13, 990, 1442}, y={"chiPlaCon.yHeaPreConVal[1]", "chiPlaCon.yHeaPreConVal[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=2, position={1031, 13, 990, 1442}, y={"chiPlaCon.yConWatPumSpe[1]", "chiPlaCon.yConWatPumSpe[2]"}, range={0.0, 11000.0, -0.2, 0.8}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=2, position={1031, 13, 990, 1442}, y={"chiPlaCon.yChiWatMinFloSet"}, range={0.0, 11000.0, -0.01, 0.03}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="s", displayUnits={"m3/s"});
+createPlot(id=2, position={1031, 13, 990, 1442}, y={"chiPlaCon.yChiWatIsoVal[1]", "chiPlaCon.yChiWatIsoVal[2]"}, range={0.0, 11000.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=2, position={1031, 13, 990, 1442}, y={"chiPlaCon.yMinValPosSet"}, range={0.0, 11000.0, 0.0, 1.5}, grid=true, subPlot=5, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
+createPlot(id=3, position={2031, 13, 1068, 1434}, y={"chiPlaCon.yTowCelIsoVal[1]", "chiPlaCon.yTowCelIsoVal[2]"}, range={0.0, 11000.0, -0.2, 1.2}, grid=true, subPlot=1, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});
+createPlot(id=3, position={2031, 13, 1068, 1434}, y={"chiPlaCon.yTowCel[1]", "chiPlaCon.yTowCel[2]"}, range={0.0, 11000.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=3, position={2031, 13, 1068, 1434}, y={"chiPlaCon.yTowFanSpe[1]", "chiPlaCon.yTowFanSpe[2]"}, range={0.0, 11000.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"1", "1"});