small tweaks to accommodate utility class