CalcCompositionData now working