Improve module, nearly stable