Adding an unsibscribe logic