RS redesign - adjusted path anchors and logic