added changes for #8