Addressing Mark + MT's comments