Latest Commit OCT 22 2:55 PM

Changes done as per testing on 21 OCT