refactoring
fix locateAssets again