A bit more rendering work