Move execute to the correct place