updated to full data