moved functions to util