Implimented compliance with new Graph method