Table mode almost accomplished