Commenting out stuff to get Subscriber to work again.