Updated to fit the changes in utils.
Improved due to changes in utils.