demo structure change