Changes to util