Added new module
Changes e fixes