Working Version with All Tables