removed some of the smaller util functions