Roll to live

* Duplicate modules fix