Added terminator stuff