Further improvements on graph