fixed bug, extended graph