added assets, needs better performance