new util class, minor changes