utils changes
More changes