slightly restructured layout