Address JDE's comments