structure change
merged fixes