Updated execution
Refactoring.