Is this correct? The signature of the method now says that we're returning a SubscriptionCalculator?