Addressing @jbau's comments