changed around the structure