Added complete modularity!