Impoved graph creation