Updated PID Calculations