additional work for #7