Added terminal stuff