updated data and mvc proj
merged with main branch