GraphA1 updated and A2 added