Refactoring to improve latency... current bug on player d/c