Updated the framework to ensure diary calculations are correct