moved to new util structure from refresh