Improved execution

Split execution into different two separate parts