New version with new table