Simplified the executor