added terminators and transistioners functionality