Added terminal geometry