Alll execution changes