New version in three tables