updated utility class