Updated table, still broken