updated content & structure