Some changes after reviewing