Cleaned up regrenderer