General Rendering Logic Added