added some changes to assetmanager