Getting ready for a dart 6.2 swap