moved stuff to util-base