Suggested a change in structure. Revert if you disagree.