commit calculation changes and data validation resolved