changed so that original structure is maintained