changed entire structure