Updated graph design