More refactoring to improve latency.. current bug on player d/c