Do some Excel Work

In the attached spreadsheet I need the allocation table to scale the Comco shares to 25% post-raise, but independent of the NEW shareholders, who will not be diluted. At the moment the formulas are grossing up the Comco shares to include the issued Comco shares and therefore resulting in over 100% in the total line. We have proposed an allocation (in the table) that is 25% AFTER year 1, but these shares are issued in three tranches 30% now, 50% on the capital raising, and 20% on year 1. I suspect the analyst has done this as pre-raise %, not post raise. This is an easy fix for someone - would be good to have the help. Thanks