updated for future tables