scope additions to aseet
merged and fixed asset conflict