Updated renderer
Rearrangements