Minor chagnes
Some changes