diff --git a/src/gui_determ_simulation.m b/src/gui_determ_simulation.m
index fecdeaf0bf933fa4b94d04da6cc15173daeedb6d..cd4dcc1cd0d5df4230b5af06df94f14b9977bbba 100644
--- a/src/gui_determ_simulation.m
+++ b/src/gui_determ_simulation.m
@@ -166,18 +166,13 @@ handles.pushbuttonCommandDefinition = uicontrol( ...
             'Enable', 'Off', ...
             'Callback', @pushbuttonAddShock_Callback);
 
-        column_names = {'Shock', 'Start', 'End', 'Value', 'Expect date', 'Unanticipated', 'Permanent', 'Remove'};
-        column_format = {'char', 'numeric', 'numeric', 'char', 'numeric', 'logical', 'logical', 'logical' };
-        column_editable = true(size(column_format));
-        column_editable(1) = false;
-        data = get_det_shocks();
         handles.shocks_table = uitable(handles.shocks_panel, ...
-            'Data', data, ...
+            'Data', get_det_shocks(), ...
             'Units', 'normalized', ...
             'Position', [0.02 0.10 0.96 0.6], ...
-            'ColumnName', column_names, ...
-            'ColumnFormat', column_format, ...
-            'ColumnEditable', column_editable, ...
+            'ColumnName', {'Shock', 'Start', 'End', 'Value', 'Expect date', 'Unanticipated', 'Permanent', 'Remove'}, ...
+            'ColumnFormat', {'char', 'numeric', 'numeric', 'char', 'numeric', 'logical', 'logical', 'logical' }, ...
+            'ColumnEditable', {false, true, true, true, true, true, true, true}, ...
             'RowName', [], ...
             'CellEditCallback', @savedata);
 
@@ -325,7 +320,6 @@ handles.pushbuttonCommandDefinition = uicontrol( ...
             end
             
             % set initval
-
             gui_tools.project_log_entry('Doing deterministic simulation','...');
             [jObj, guiObj] = gui_tools.create_animated_screen('Running deterministic simulation. Please wait...', tabId);