Update to PIP baed on feedback