Update for graphics 2.0