changes some of executor to use the new system