restructured some more