diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
index c15faf1e83b7c82493dcfa5d9a1070c5e53d4cef..e3f076bc44a0b453ee3130af172a6c8a6c1f3bc0 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
@@ -3,7 +3,7 @@ package MV3500Cohort2019JulySeptember.homework4.McCann;
 import java.net.*;
 import java.io.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 import edu.nps.moves.dis7.utilities.*;
 import java.util.ArrayList;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
index 3585cf0cb28870d9f7ff841b314739c90c337fc5..91bb956b09ff7a04231d1b0499438c690dd54c63 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.net.*;
 import java.util.*;
 
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
 import edu.nps.moves.dis7.enumerations.*;
 
 /**
@@ -374,7 +374,7 @@ public class McCannPduSender
                             // https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/tree/master/assignments/src/MV3500Cohort2018JulySeptember/projects/LoeffelmanSeverson
                             
                             CommentPdu    newCommentPdu = new CommentPdu();
-                            ArrayList<VariableDatum> payloadList = new ArrayList<VariableDatum>();
+                            ArrayList<VariableDatum> payloadList = new ArrayList<>();
                             
                             ArrayList<String> commentsList = new ArrayList<>();
                             commentsList.add("Hello CommentPDU");
@@ -387,7 +387,7 @@ public class McCannPduSender
                             {
                                 VariableDatum newVariableDatum = new VariableDatum();
                                 newVariableDatum.setVariableDatumValue (comment.getBytes());        // conversion
-                                newVariableDatum.setVariableDatumLength(comment.getBytes().length  * 8); // bits, not bytes, see spec and javadoc
+                                newVariableDatum.setVariableDatumLengthInBits(comment.getBytes().length  * 8); // bits, not bytes, see spec and javadoc
                                 // alternatively, you do not need to set this and the marshaller will figure it out from the byte array
                                 // (see javadoc for VariableDatum.setVariableDatumLength())
                                 payloadList.add(newVariableDatum);