Refactored with resourceNode + handled visibility period in display