First few changes from PIDS