new build and fix table selection