refactoring, real-time stuff
Merge branch 'realtime'