Renamed functions and removed test player