modified the util package