Changes to flags, added terminal propagation