Small changes for further work