updates for #1