fixes
re-implement execution handler