Added some changes to utils.