Adjusted demo structure