Re-added TAChoice to calculation