Working on improved Render Engine