better USE handling