modified stupid table location