Working on rebuilding tables