Change to hierarchical execution strategy
Make things pass