Added terminal propagation