added functionality, renamed utility class
some minor changes