assets and some change in api