changes to util.java