Updated Util Classes Again

Problem with updating before, hopefully this fixes it