More work for #39