move more to the utility