Additions and simplifications