VID-1524 add render logic