prepare to handle subscriptions
code gardening