update switch to include terminals