moved files here from local hevi_util