Migrate to graphics 2.0