Updates for #75