Some changes and additions