working after fix to get_all_data