refactored and restrucuted assets