System now correctly behaves in real-time or turn-based scenarios.