Improved dart mode