finished modularity 2