Simplified table code (oops!)