More Changes and Fixes to Direct Update

More Changes and Fixes to Direct Update