Added calculation xforms