fixed the data and codes