diff --git a/source/functions/simulink/model/irregExcFullDirF.m b/source/functions/simulink/model/irregExcFullDirF.m
index c16bc7368..64faf2d69 100644
--- a/source/functions/simulink/model/irregExcFullDirF.m
+++ b/source/functions/simulink/model/irregExcFullDirF.m
@@ -6,11 +6,11 @@
 A1=repmat(A1,1,nBins);
 A = repmat(A,1,nBins);
 %initialize outputs
-Fext = zeros(1,6);
+Fext = zeros(1,size(dofGRD,1));
 relYawLast=zeros(M,N);
-coeffsLastMD=zeros(N,M,6); %  dirBins, freq, dof
-coeffsLastRE=zeros(N,M,6);
-coeffsLastIM=zeros(N,M,6);
+coeffsLastMD=zeros(N,M,size(dofGRD,1)); %  dirBins, freq, dof
+coeffsLastRE=zeros(N,M,size(dofGRD,1));
+coeffsLastIM=zeros(N,M,size(dofGRD,1));
 
 relYaw = dirBins-(Disp(6)*180/pi); % relative yaw angle, size = dirBins = [length(w) nBins]
 
@@ -28,7 +28,7 @@
     I=1:length(relYaw(1,:));
 end
 
- relYawGRD = zeros([6 size(relYaw.')]);
+ relYawGRD = zeros([size(dofGRD,1) size(relYaw.')]);
  for k=1:6
      relYawGRD(k,:,:) = relYaw.';
  end
@@ -96,7 +96,7 @@
 B11 = sin(bsxfun(@plus,w*time,phaseRand(:,:,1)));
 C0 = bsxfun(@times,A.*spreadBins,dw);
 C1 = sqrt(bsxfun(@times,A.*spreadBins.^2,dw));
-for k=1:6
+for k=1:size(dofGRD,1)
     D0 =bsxfun(@times,fExtMDint(:,:,k).',C0);
     D1 =bsxfun(@times,fExtREint(:,:,k).',C1);
     D11 = bsxfun(@times,fExtIMint(:,:,k).',C1);
diff --git a/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx b/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx
index e67633d11..3c97f030c 100644
Binary files a/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx and b/source/lib/WEC-Sim/WECSim_Lib_Body_Elements.slx differ