Re-org, adding more ideas