rework of the structure. should work now.