More work on graphics2