Reworked render path