some modifications to the structure, as I understood it should kind of
be, from Tim