update to allow flex structure