Modify for changing structure