updated subscription_controller