Adjusted Table Counting System

This should help with consistency.