added TODO task to make this utility better