made changes after justin's review to finish it up