modify to :import-from instead of :: to use internal functions