updates for #15