patching up recent changes