"working" version - still latency issues