more work for #24