add new unsubcribe logic 6