Janet,
 I have modified the above as we discussed.  Please check my math.