improved ux for #18