added client side subscriptions
fixes