update for #8