diff --git a/lib/+artoa/+controller/+edit/+pressure/plot.m b/lib/+artoa/+controller/+edit/+pressure/plot.m
index e95d0928dbbdab05f628acbc4829aabf5517a14f..619acae3c7cf8cce7e7582c9f1f9e6ad56087660 100644
--- a/lib/+artoa/+controller/+edit/+pressure/plot.m
+++ b/lib/+artoa/+controller/+edit/+pressure/plot.m
@@ -1,5 +1,5 @@
 function [] = plot()
-%PLOT Plots or updates the temperature points.
+%PLOT Plots or updates the pressure points.
 %   If the plot already exists and is valid, the points only get updated.
 %   Otherwise the plot will be initialized
 %
diff --git a/lib/+artoa/+controller/copyRfbToWorkspace.m b/lib/+artoa/+controller/copyRfbToWorkspace.m
index a53b0846259063ae9bc28ef565d35c62fa2a91b9..2ebabb414f12661f95e467d0f8bde21dabe1021d 100644
--- a/lib/+artoa/+controller/copyRfbToWorkspace.m
+++ b/lib/+artoa/+controller/copyRfbToWorkspace.m
@@ -6,31 +6,44 @@ global artoaDataInput artoaWorkspace;
 
 %% Generate workspace
 
-% TOA
+%% TOA
 artoaWorkspace.toaData = struct();
 artoaWorkspace.toaData.status = zeros( ...
     size(artoaDataInput.rfb.DATA, 1) * length(artoaDataInput.rfb.VARIABLE_LIST.time_of_arrival), ...
     1 ...
 );
 
-% TEMPERATURE
-artoaWorkspace.temperature = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature);
-% PRESSURE
-artoaWorkspace.pressure = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure);
+artoaWorkspace.toaData.toa = [];
+toaColumns = artoaDataInput.rfb.VARIABLE_LIST.time_of_arrival;
+for i = 1:length(toaColumns)
+    artoaWorkspace.toaData.toa = [ ...
+        artoaWorkspace.toaData.toa; ...
+        artoaDataInput.rfb.DATA(:, toaColumns(i)) ...
+    ];
+end
+
+%% EXCLUDE INVALID TOAs
+toaToExclude = artoaWorkspace.toaData.toa(:) == 9999;
+artoaWorkspace.toaData.status(toaToExclude) = 2;
 
-% STATUS
+
+%% TEMPERATURE
+artoaWorkspace.temperature = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature);
 artoaWorkspace.statusTemperature = zeros(size(artoaDataInput.rfb.DATA, 1), 1);
+
+%% PRESSURE
+artoaWorkspace.pressure = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure);
 artoaWorkspace.statusPressure = zeros(size(artoaDataInput.rfb.DATA, 1), 1);
 
 
-% EXCLUDE LINES CONTAINING 9999
+%% EXCLUDE LINES CONTAINING 9999
 temperatureToExclude = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature) == 9999;
 pressureToExclude = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure) == 9999;
 %pointsToExclude = or(temperatureToExclude, pressureToExclude);
 artoaWorkspace.statusTemperature(temperatureToExclude) = 2;
 artoaWorkspace.statusPressure(pressureToExclude) = 2;
 
-% RAFOS DATE
+%% RAFOS DATE
 artoaWorkspace.rafosDate = artoa.convert.dmy2rd( ...
     artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_day), ...
     artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_mon), ...
@@ -43,7 +56,7 @@ artoa.convert.hms2rd( ...
     artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_sec) ...
 );
 
-% FLOAT DETAILS
+%% FLOAT DETAILS
 artoaWorkspace.float = artoaDataInput.rfb.FLOAT;
 
 
diff --git a/lib/+artoa/+gui/+edit/pressure.m b/lib/+artoa/+gui/+edit/pressure.m
index 3de73165da4ee2cd3c5f3367d3cbff1677381bfd..025e0aada23a8fc00b2a056ea76d4a6bf6f19e55 100644
--- a/lib/+artoa/+gui/+edit/pressure.m
+++ b/lib/+artoa/+gui/+edit/pressure.m
@@ -8,7 +8,7 @@ global artoaGui artoaWorkspace;
 windowTitle = [ 'ARTOA4 - Float ' num2str(artoaWorkspace.float.floatname) ' - Pressure' ];
 
 
-%% Initialize temperature gui
+%% Initialize pressure gui
 
 artoaGui.figures.editPressure = figure( ...
     'Name', windowTitle, ...