Changed Switch/Player Interaction
Revert "Changed Switch/Player Interaction"

This reverts commit 3fc0f9097dc4c21c1c13f9b4c9c08b3ef12cbb34.
Merge remote-tracking branch 'origin/master'