Testing new rendering code part 1