Update core/utils, Add modified rivets