added subscriptions and updated views