changed to David's asset structure