I've wanted to do this upgrade in my Dart for awhile now.