Added more rendering code