Create PIP checker as a v2 and reinstate previous changes