Adding stuff Daniel forgot, including updated PID