added support to unsubscribe (not working)