removed deprecated switches.
added table.