rename states in conductor to be less confusing
Merge branch 'master' into add_ps2