Reverted back to main structure