altered to new structure, added content