Added better realtime capabilities