more work for #44