modified some of the utils