fixed asset ordering issue
merging commits