updated for table changes