Making the whole PIP-installable