New heads on the way for my Dart, few changes

See if this works