Updated 22-Dec Eod and Added trading calcs