Some changes in rendering