adds improvements to modularity