Added ore modularity;