Some changes after analyze