Another idea for #6