updated subscribe condition