enhancement for #3