Changed execution model to make some semblance of sense