Added custom calculations