add unsubscribe and fix subscribe to existing