Update interface; Tweak unsubscribtion
Update triggering behavior