More work on rendering