To be clear, I think its probably best to either revert your change you mentioned in #2 or wrap it in an "if dist_ge quantal".
To be clear, I think its probably best to either revert your change you mentioned in #2 or wrap it in an "if dist_ge quantal".