some changes on rendering