new rendering and bug fixed