commit before adding subscriptions
subscriptions?