Address EJ's comments