new module added. om-core clean-up