added subscription switch