Added subscribe to new server - not err free
Fixed merge conflicts