Moved to polling instead of SSE