new assets
merge
stuff
fixed anim