changed the structure some.