Update new module and bug fix