fix and simplyify subscriptions
add gratuitous transitions