PnP, all options and warrants were rolled back 10:1 in the same way common shares were.  The 40M number you are referring to represents approximate dollar value of all outstanding in and out of the money options and warrants.  The purpose of the slide was to illustrate potential additional revenue to the company should these options and warrants be exercised.  So, not remotely close to the dilution you suggested.