fixed modularity issues