Working on structure some.