Execution

Just for feedback
Changed to an if statement in #274