Went back to tableswitches