Update and fixes changes from utensils

@jayzes I didn't get this working locally to test, but this should fix the changes made within utensils. Hit me up if you have any questions.