new changes after comments