Using terminator and other changes