diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 0fef425cf0a04c70c7f5d880b29548af7bd3864b..1cf96b803dff02fac84e5cfb81d22766cc5003aa 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -53,6 +53,8 @@ MainWindow::MainWindow(QWidget *parent) :
 {
 
     ui->setupUi(this);
+    ui->JsonParamComplete->setLabel("Incomplete");
+    ui->JsonParamComplete->setEnabled(false);
     qRegisterMetaType<int8_t>("int8_t");
     qRegisterMetaType<QVector<QVector<double>>>("QVector<QVector<double>>");
 
@@ -490,7 +492,12 @@ void MainWindow::updateJSONParams() {
         emit(setParamValue(key, value));
         sleep(1);
         
+<<<<<<< groundStation/gui/MicroCART/mainwindow.cpp
+        ui->JsonParamComplete->setEnabled(true);
+        ui->JsonParamComplete->setLabel("1/12");
+=======
         ui->progressBar->setValue(1);
+>>>>>>> groundStation/gui/MicroCART/mainwindow.cpp
         value = s_pid_rate.take("roll_ki").toDouble();
         key = "s_pid_rate.roll_ki";
         emit(setParamValue(key, value));