starting to clarify structure just a little bit