Some changes here and there.