changes for #8