simplified changes to stay closer to original structure