removed double assets
rewrite almost done