Reduced the number of subscriptions substantially.
Fixed the disposable implementation.