Yes, as you prefer. However, I would still like to see this logic in the proper calculator instead that in the base class (this could be addressed separately too).