slight further mods to 2d, added grantnumber