improvements for #6