More additions and changes.