Updated PID values and fixed chooser not showing up
Merge remote-tracking branch 'origin/master'