Editing: Util.php