Swapped up rendering a bit in preparation for future composite model