Done with merging the real-time and back-end