merging utils changes as well