More work for #24