Player switching
Fixed Player switching