Make Graph better