Added Transclude and made added logic shortcut