changes after comments