updated to fix, data extraction bug