places and actions modified for further work