Adding assets and more logic