Addressing Edwin's comments (partially).