More work for #39 and #32