More Additions and changes