Update for #34