- work on rewrite of the module