Switch executor to pesos, better logging