Reorganized for modularity and flow