Started work on render changes