Updates for new Dart
updates
IT WORKSgit diff