More work on rednering draft