new modules added&bug fix