added CR suggestions