resolved some discrepancies