Replaced entire structure for testing