added return in switch in PlayerView again