More Changes and updates to code