More Additions and changes.