Simplify further
Use TableLocations correctly