changes to the executor. Original function not yet removed