Changed Logic + Rendering