further work fixup