graph and 1816 1817

Signed-off-by: HalFtaN <half.a.tan@gmail.com>