Minor changes
Some changes