updated.. some discrepancies