Working on main execution
Merge remote-tracking branch 'ddx/master'