further work finally working well