Separated Graph Generation
Added code for witness generation