Added in the subscriptions
Removed the stupid