more rendering unification work