Added check for use_pip everywhere