Updated Weight and CAI Calculations