Added back 'tee' and 'generalize'