Changed some execution patterns