Switch over to new render methods