refactor execute to make roodi happy..