subscription sync'ing

made (un)subscribe better