some new additions and minor changes