r5 update for Graphics.