Added additional terminator logic