Update

Added some changes to address some issues with the utility class