restructured blocks, they are still clunky