move to util class