Fixing render after merge.  Not complete