Develop improve renderer