Changes to use the graphicscontroller