Added terminators and some controls