Modification for the new PID implementation