updates to the new utility classes