refactored scope/transclusion