Rewiriting more modules
Rewiriting more modules