Graphics changes for 2.0