Updated grapgGen