Small few changes to draft 07 from Rathmines