fixes for execution
Functionalities optimization