some changes for further work