Further changes to the graphics system