more work to patch things