update for #6