improvements to modularity