updated and fixed data