Improved dashy-client flow