Third set of PIDS changes