updated structure, added content