Second set of PIDS changes