some changes for #8