updates for #58