updates for modularity