Some changes and some new additions