Fully diluted we will have around 2.3 billion shares. That is assuming 100% of all options are converted.
Most of us just use 2.3 billion to calculate the MC as regardless of timing it is likely to be the size of the register by the end of the year.