continue work on subscriptions