updated subscribe / unsubscribe