fixed import functions