further change after comments