changes after comments CB, 20140424