Changed code around a little in Executor