added more modularity