reverting structures to use state merging