Rendering polished a bit. Still not enough