moved functions between utils/export