Get_calculated_data is now working too