Finished modularity2