Working on wait_for_tables