further work on #21;