Updated rendering (broke it, I'll fix it later)